Merged
Conversation
Cobblestone generator consumes 2 power + water + lava to produce cobblestone. Obsidian generator consumes 100 power + water + lava to produce obsidian. Both atomically check that water and lava are available before consuming either.
Pulls power from all non-facing adjacent blocks and stores it for downstream blocks to pull from in the facing direction.
Pulls fluid from all non-facing adjacent fluid blocks and holds it for downstream blocks to pull from in the facing direction. Updated FluidPipe, FluidContainer, LavaGenerator, CobblestoneGenerator, and ObsidianGenerator to recognize FluidMerger as a valid fluid source.
Register all four new blocks in Atlas, dialogs, and test factories. Add YAML block definitions, recipes, and update test counts.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary